[XEN][IA64] IA64 build fixes after recent PER_CPU changes.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index eccc8bb34939c02cd2268c8008cf77fa6b552abb..a9f334f10fda1c10898624fba41aa1176bee9396 100644 (file)
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -423,13 +423,14 @@ void start_kernel(void)
        (xenheap_phys_end-__pa(heap_start)) >> 20,
        (xenheap_phys_end-__pa(heap_start)) >> 10);
 
+    late_setup_arch(&cmdline);
+
     scheduler_init();
     idle_vcpu[0] = (struct vcpu*) ia64_r13;
     idle_domain = domain_create(IDLE_DOMAIN_ID);
     if ( (idle_domain == NULL) || (alloc_vcpu(idle_domain, 0, 0) == NULL) )
         BUG();
 
-    late_setup_arch(&cmdline);
     alloc_dom_xen_and_dom_io();
     setup_per_cpu_areas();
     mem_init();

diff --git a/xen/common/domain.c b/xen/common/domain.c
index ce779cb24003dc5194890a438c254f242aa16859..ef95ff5b2e7a1b5b7ae7229a524e21f86d6de66f 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -21,6 +21,7 @@
 #include <xen/hypercall.h>
 #include <xen/delay.h>
 #include <xen/shutdown.h>
+#include <xen/percpu.h>
 #include <asm/debugger.h>
 #include <public/dom0_ops.h>
 #include <public/sched.h>

diff --git a/xen/common/timer.c b/xen/common/timer.c
index e268f86ea9da97ac374a8e17d73a5eff593a4d72..526bb48959b77303cee2edf9ad7b65638eb88d08 100644 (file)
--- a/xen/common/timer.c
+++ b/xen/common/timer.c
@@ -17,6 +17,7 @@
 #include <xen/softirq.h>
 #include <xen/timer.h>
 #include <xen/keyhandler.h>
+#include <xen/percpu.h>
 #include <asm/system.h>
 #include <asm/desc.h>